Fixed #23 3.0