[Resolved] #26