changed check behaviour