Fix potential future issue