Remove small BUG