changes, fixes nens/lizard-nxt#500 :100: :100: