Fix parser when handling calls/messages to objects