fixed buggy bug