Fix previous commit. Some changes were missing.