fixing zap starter location
Merge commit '625e1000eddb5aab8e029644478ed7fa340a59e6' into HEAD