serenader issues fix