#gh-28 Fixed Minor