Bottle bug fix and global check