Attempting to fix bug