fix bug for good