Multishot fix