First attempt at fixing 1257