added exception for '1'