The patch in #6 does not seem to apply for the latest 4.0.2 version so i recreated the patch.
y_h → created an issue.