acutally fixing #55, and tests