Fix bug on remote drawing. Simplified code.