fixup after dachary and jecluis suggestions