Mega change bugfix