Commit fix to bug #418 http://bugs.skysql.com/show_bug.cgi?id=418