[BUGFIX] Uncomment stuff again