Fixed :bugs