Not so ugly fix for previous ugly fix