Stupid shelves, cont. @6181d5a80b