#134 fix