Another fixing attempt