corrected #22: General error: 2031

check this error and merge if all's OK