Bug Fix - Arrow not appearing in first load