Fix the same bug in previous two commits