fix problems with activity sw