Most likely fixed #57