attempt to fix pinning bug