emergency bug fixes