Fixed to work with data=None