Synchronous call fix