Fix #1041 - Make methods protected instead private