[Issue 30] Fixed. [Issue 33] Opened.