[GitHub-#19] issue fixed