v1.0.2: fix for empty