Bugfix: use correct values