Export Solution Bug fix