Hotfix on bug #12.