1240: feature 1 (fix something in moby)