#49 fix