3.4.7
Attempt fix #287