This is one of possible fixes for #199