Fix synchronization issue per #20