[tafujita] Bug fix