Quick-fix to #599