This may solve #56