This should resolve #1