See if this works better with <3.0.4