solution fixes