Minor merge fix.    Hamster Version: 2.51