too many $$$ -- quick fix after code review