This should complete #46