Fixed account to detect correct expansion