#16 Bug fix