Redundant calculation removed (again)