Fixing issue #52
Fixing issue #49