Add workaround for TW-1452 bug