Fixes #13 - Logic Error