Real bug-fix!