- Workaround for kicks