CORE: Fix for bug #120.