exercise solution fixes