Fixed #1242