Fixed #2

This may need to be revisited in the future.