final fix as requested by gruns