More fixing

- Getting annoying... really!