some fixes for numeric (still some issue when deleting)