updating to address issues #1299 and #1313