Bug fix in version 99