-Fixed defects 284, 264, and 283