Had same issue and the problem was solved by using your recommendation.