Possibly address issue #290 and #292