Uncomment this when issue #35 is fixed