Fixed #80 Fixed #81