fix for null issue