Fixed idiotic stuff