Fixed an issue with workshop conflicts