Dynamic Variable fix