[Issue 6] Fixed. [Issue 22/23/24/25] New issues.