Added fix for size 0