More Fix for #894
Remove unnessary synchronization