more fix for the same problem