Bug fix for ExtendedMasterDetailPage