Maybe this is related to benjy's optimizations?