Duplicate of #1063 (can be closed)