merge MFernflower's commit