Fix Picture issue