Fixed broken methods