Bugfix for fb7de3c432ffb95be5af6b93193de8b52bc60fd1