Re-fixed issue 12 (overwritten on different commit)