Adjustments to resolve #2