Goskiy fixes 2