very important fixes