Fixed reassign issue