Fix Semvak :v part 3