v1.3.0.528 - revert #519 - second attempt at fixing an issue on several implementations