Bug fix of previous commit