partial fix issue 146