This probably breaks something but might make numbers go away