upgraded to 36.3.6