removing omitempty for testing