Fixing issue #12
https://github.com/markkolich/curacao/issues/12