Make retricting draw over / on top work

Fixes #830