and more fix