Fixed, hopefully, for new patch