Collins, fixes #521