#fixes 1725 and #1724