Fixed #1124

Yes