Update for issues #34