let's fix this bug PROPERLY.