Could you solve this in #1643?