Bulk create fix

Please review, @cfaessler.