fixing remote decorator