More robust approach