#gh-6 Fixed Critical