Follup to #1012