Comment added on shutdown
API options are finnally fine