Fixed after merging in xp-framework/xp-framework@59d5feb