Support limiter removal (fix #90)