Fixes #1373 and Fixes #1410