In process for fixing #138