Simplification of the previous fix.