Same issue, it annoys me something awful