Fixed up issue #1