Fix all invocation

Fix #952