revisit #552