adapted patch to 7.4.519