[Resolved] #31; #32