Fix for no data passed in