Quick fix for potential issues