shake with bugs fixed