Hardware fix