Draw: Bugfix for bucket