fixes for the diagnosis prototype