This code block has been added in #461