Prevent compile from running twice
Merge branch 'double-compile'