Redo  #866 fix. Bit cleaner