Fixed #159