fixed eval more