[BUGFIX] #66 Edition - more debugs