gh-52 #Fixed #Minor