merged attempt to fix wrong profile image bug