Bug fix for some systems