Added expression requirement. This is (hopefully) not permanent.