Fixing issue 33