Fix
Cleanup
Possible fix #2