Fix #23 on issue tracker.