#795 fix