Small bug, and style