I hope patch 1.18a address this