may be this should be merged with the `if` just below ?