Feature fix bugs