Addition to fix to bug #597, http://bugs.skysql.com/show_bug.cgi?id=597