Fix freedrawing

Bug exists since commit #6b5f049bb0a459dd29e2927ed99094b3e7baec66

Closes #1516