#58 fix again