Fixed #1124

is that right?