Fixed #1095