Fixing issue 14