removed needless check