Added mini workaround for some lunch errors