Working on bug #396