fix for issue: #9