Final fixing of task #03. v1.2.6