Fixed icarus crash on OSX/Linux

made this consistent with iterator handling elsewhere