Fixing mess-up