Funnily enough that was one of the things Golden Gate fixed, at least for me on my M1.