I think this fixes the make modal problems..