Start fix #90
End fixing #95 +#84