Workaround for bug