isActive bug fixes