Fixed #1264