fixes for delayed