Stupid optimization, I think