Fixed arrow issue