fixed for wp3.9