Fixed #1146