fixed bug
Merge branch 'wip-kreld' into kreld-merge