Bug in previous commit fixed