#6 - Bug fix