#1159 missing part of commit