Fixed in [8b790617eb], test-cases extended, etc.