Potential bug fix
Fixed issue #65