Refactor ConvertToPicture #329

this fixed #329