Fix for NULL-Values [NOT STABLE]