Fixed extras handling