Added default check