solved issues from Petra