#115 fix