Bugfix on test draft