Fix for thomas' error messages. again.