Added another check #885