Fixed #1412