[z0294] Fixes #58