See if this fixes something...