Fix synchronous mode