Fix on non-dualsystem devices