Issue #2141119 by kim.pepper: Fixed bug with data not being returned