Ram - Fixing Bug 2154