Fixing issue #245