Fix #36: Revise AS Core Ext (by @hachi8833)