Attempting to fix number functions