Issue 11 fix

2 jobs for issue80 in 1 minute and 25 seconds