Fixed two methods