Fix for previous commit which was not complete