Cludge to make app work in thrifty mode