Small bug fixed from prev comit