some little bug fixing