Closes #226
Adding some verification against #225