added a temporary fix for second bug from #9