Maybe resolve issue 184

I'm not sure about this but looks like this resolves issue 184