Enhancement and global fix