Try to fix problems with suspend
Fixes for prev commit