Bug FIX. Take whole prefix...