Fix quick and dirty before fix from Willy