Fix for null error