Fix for Activity states