Fix the broken build #26