Paul's fix