fixes #5, reduced overflow scope