Improve #1509: Call onMessage before Callable gets executed