#110 fix