Version 2.16.18
Fixed: Minor problems