Fixed #552