Fixed bug with zero-sized data