fixed static type issues