Small fix to using non-uniform shapes