Bugfix: move clause to right place.