Fixed #49