Add option to change the behaviour so that objects are not selected when they are finished being drawn