Better conditional check