Workaround for kicks