Fixed timeout so surround will work