fixed evaluation, made things work again