Fix xp-framework/core#20