Fixed Issue355