another attempt to get rid of eval-like statements ... previous did not work