Related to #46 above