Proper check added