Babbardi's critical bug fixed