Keep trying to fix bug...