#116 n #132 fix