Added what I wrote in #1587