Work on bug #14
#14