Fixing errors to attend #830