Fixes #867 & Fixes #868