Fixed #1276