Fix for #99

I know it's not a real fix but can work temporarily