Solved limit issue. Fixes #536