#178 fix