#41 fix