Fixes issue #1

This is the simplest for I could come up with to implement this.