Fixed Runtime Bug