Try to fix zero-length error