This PR fixes a bug discovered in #483. Also new property-based tests would catch that bug if we make a regression.