Another fix for the same bug