trying to fix stuff...