fix the switch from ages ago