Fix for yet another guide related bug