Changed binding resolution to prevent nulls.