applied patch by Jukka