Related with previous bug