polished rafsi handling a bit
probably introduced a bug ;-)