Fixed Issue #2 from Mr. Boring