Bug fix for previous.