Fix for runtime removal