Fixes Draft encoding bug - fixes #1487