refactor check 1.5