Accommodate to @e9b5e7e