fixed buggy again