Adds a candidate fix for #210