Attempted to fix bug