Working on issue 172. Already applied fix. Working on tests.