gonna solve the bug for good