Fixing Sharecraft Bug