Closed #81. Related with #54