gh-54 #Fixed #Critical

gh-54 #Fixed #Critical