#47 fix