Fixes issue #119 for my case

Uncertain if this is a correct fix, at least should provide an idea where it is breaking.