Application - Draw: Bugfix for picker#