Added as #289