LPS-41073
LPS-41073 Isn't this the proper fix?