Bug has been fixed with last commit