Fixed non-public methods