Fix #153

Fix #153 

And update sync level. 

@dirk-thomas Please review.