Addresses issue #68

See issue #68 for details on the bug