Fixing issue 24