Another attempt on fixing #11