Try to fix annoying timing issue with the 'serve' script