Rebase with master
Added failed check