SHould fix #2195