Fix for Visible Data Races (Issue #254)