Fixing and Closes #2