removed needless conditional check