Fix potential issue