FIX: minor code improvement.