Fixed bugs
.
.