trying to fix... things