Implementing salimanes fork patch