Gh 552

Fixes #552. If I understand demmurage right, probably closes it too.