1242: feature 2 (Fix in moby)