fixed for 4.1.12 (untested)

This version is untested