here is possible fix. it is alsopresent in v4.