Another attempt to fix stuff