Handler kind fix: now uses boolean for fixed count and lock