Fixed private fields issue