[#10] Fixed issues from comments under commit 561c973a256db7482aba75f6138d2239b29b75fd