Feels like spring should have done this