Fixed issue when last param is a context; does not get parsed