Bug: fixed bugs