[2.3] Bug fix