issue 227 fixed