Update to fix bug