Fixes #1451, Fixes #1543