Attempt fix/addition for issue #374