One more fix about crappy code