Temporary fix for #420. To investigate later.