Some extra stuff for issue #3