bugfix - had to undo an attempt to optimize the calls to