Corrected an error where not all access was properly and consistently synchronized