Synchronous bugfix. Previous commit is broken.