Fixed offline to work with everything