Server/Share Reverse Fix

round 2