fixing ugliness