bug fixes for 60, 116, 125, 127