Fixed bug where blank extraData was added