Improved fix 3ca87a3bd5741fd26494ba8628e68b1abc95ec08