Actually fixing the mess
Got the commit 'a' and used its code.