Simplificated fix