Improve/fix build #395

Closed joaoantoniocardoso closed 1 month ago