Quick fix for null