- base defence fix for previous fix :) not it should work in both cases