Add check and corresponding test