Fixes #1 This should close that bug right?