fix for current shots