#138 fix