Yes please solve this bug