This should fix #3388

at least it does so for me...