Added workaround to pub infinite loop