Follow up for issue #12