Bug fix. For a major show-stopper