really fixes #6545