Fixed issue with omitempty