this should fix #3104