Fixing issue #30