Fixes #6592
Merge pull request #6594 from mwerezak/runtime

Fixes #6592