Fixes #68
Fixed a bug caused by fixing issue #68