#841 fixed