Fixing issue 215