Bug fix in shake