Fix of #104
Cleanup