Fixed class-level variables here, too