FLOE-160: A code improvement.