kinmury Mermaid and Code fix