handles issue #431 and #435