Fix for bare metal host