Bugfix (to fix buggy older bugfix...)