Fixed: bugs when first using