Fixed #1124

Should be fine without them