Updated according to Willem's comments