This should fix #1