Fix for forks