[BUGFIX] Fighting my stupidity