fix it finally