Fixing issue 12