Fixing issue 157