3.0.5: try this again?