Fixed for compatibility. New branch.