Hopefully fixed a merge problem with Race Select