Possible fix for #356 and #545

Created by: lohnn

I had the above mentioned error, and this seems to have fixed it. Works in my project and the demo project included in this repo.