Missing commit for issue #19