Another attempt at fighting the "Einstein bug".