fix #584

Hope this is all, now.