Relates to #386, test for it