Fix late bind