Another makaba fix #2