Fixed issue: #3