adjusting for side effects induced by fixing #449