Trying to fix one nasty bug