Fix issue with extras