Address #309: change to direct invocations