mark chagne bug fix