Fixed #1552