resolved JBQA-1416