fixed some issues in 10.9