Bugfix: remove invalid handling of bounds