Fix issue #176 and another
2014