#5256 Add workaround for description reference issue