Fix issue with remote