Updated Possible Fix to #119