Attempt at fixing mess