Import picture fix, before facebook merge