Bugfix (this solution did cause problems)