Fix TWK-1712