Fix attempt for #1308