BROKEN COMMIT: YAF (Yet Another Fix)