#39 fix