fixed wp3.6. issues