Bug fixes last commit