Cleanup for issue fixed #11