cleaner way to handle swagger serialization issue