Solved by #586
Solved by #586