#25: refine the fix