Fixed another related bug