better fix for the same problem?