Trying to fix bug...