CW-57 fixing hint problems