Fixing issue 159