Adding fix from Issue #14