Last bugfix before epic winnage