Fixed class variables initialization