Easy fix for bug #352