Fix for issue #912. @htrex give that a try.