removed some inconsistent beahviour