Fix: #800
Fix: #800 & resolve merge conflict