I have the exact issue that you described, have you found a solution yet?