Third attempt at fixing #484