Added the infrastructure to fix #138