#874 fix