ref #2649 , fixed format stuff