fix commit:a3c8a99 which overwrites some previous changes