updated to fix comment #22