issue 408 fix (needs test)