Fix [Scrumwise #37]