Patch 2. According to emilien advices