Workaround for issues: #3 and #4
Version with workaround for issues #3 and #4