helper class resolution fix