Fixing and Closes #6