Fix for setup history