Fix for fatals