Code

bugfix: accept more complex where-statements too