Fix unbound data condition