Fixed default picture handling bug