Added number check