Adresses #69, removed incidental limit introduced earlier