Bug fix, removed too much in previous commit