Re-added Pauls fix