Fixes

STANDARD - 115   GOLD - 152