fixes (thx to nogarbage)