Fix unreleased behavior + add more debug