Fixed eval macro