Fixed Issue331 errors