Problem solved and tested