added check, added case