Resolves #97 with mapOverVariables