Temporary hack: see if this fixes Ahmed's bug