Fix to my prev commit, it's still unfinished