Credit @Mortal for restudy (#4463)