#gh-39 Fixed Critical Exception