Actually just remove this line and line 59 and the temp solution works fine for now :)