fixed things sort of