Updated for fixed issues.