Follow intuitive fix for Bug1
Merge pull request #10 from Titan-C/bug1

Follow intuitive fix for Bug1