-fixed to bugs