Bug fix for previous commit