Fixing issue #177