Actually make 21 work as intended