Temporary workaround for bug #35