Fixed #1213