Attempt to fix bug