[tafujita] Bug Fix