fixing mess