Fixed #1266