Related issues: #603