[GitHub-#16] issue fixed