Resolve #408 #434

Closed marrober closed 3 years ago