Fix Shot creation