Fix for #1223

This is still broke.