Added back code now that problem is found