Jayce 4.21 fix