workaround end not firing without data