Bugs are resolved in this commit