Remove this `screen` based optimization in case of edge cases