fixed static issues