perhaps fix issue 414