This may indirectly be solved by #104
This may indirectly be solved by #104