bit more fix