Fix for evaluation along with address assignment