Fix for Foreman