bug fixes for P1.4