Fixed #1195