Fixes #2

Hmm, how is this related to #2?

Second, why not delete the remainder of the method after the return (dead code)?