Bug fix (previous commit)