Fixed the problems with KOTV and G0DS