Additional fix on previous commit