fix issue request 29