fixed last issues with suspend/resume (hopefully)