Fix issue with remote mentoring