MYGUIDE-579 Fix