fixing big bug2