#129 fix