MYGUIDE-151 small changes to previous commit