XIB support fix