#21: Fix buld change