Fix issue with remote image view