Added in #488