Another makaba fix #3