Ok, this should actually fix #6041 :)