Temporary, for bug #116