Fixing the errors found in #280.