Fix #13 and #14

You're right, I thought there was an error without this change, but I was wrong. I guess I was confusing the sync and async cases or something.