Workaround for bug #312 testing