Workaround issue #297