Potential fix to startup crash