[1.6] Bug fix